From: Glenn Morris <rgm@gnu.org>
Date: Thu, 1 Dec 2011 22:34:24 +0000 (-0500)
Subject: Fix some em-hist custom types.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~1472
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ccc53f00c3fdb3d7d19d4d2eaccc4b4194361852;p=emacs.git

Fix some em-hist custom types.

* lisp/eshell/em-hist.el (eshell-history-file-name, eshell-history-size):
Fix custom type.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fefa763b62f..44fd9414b95 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,7 @@
 
 	* eshell/em-hist.el (eshell-hist-initialize):
 	Handle eshell-history-size nil and HISTSIZE set or unset.
+	(eshell-history-file-name, eshell-history-size): Fix custom type.
 
 2011-12-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 5ae419f7ba9..5e44e541526 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -90,12 +90,14 @@
   "If non-nil, name of the file to read/write input history.
 See also `eshell-read-history' and `eshell-write-history'.
 If it is nil, Eshell will use the value of HISTFILE."
-  :type 'file
+  :type '(choice (const :tag "Use HISTFILE" nil)
+		 file)
   :group 'eshell-hist)
 
 (defcustom eshell-history-size 128
   "Size of the input history ring.  If nil, use envvar HISTSIZE."
-  :type 'integer
+  :type '(choice (const :tag "Use HISTSIZE" nil)
+		 integer)
   :group 'eshell-hist)
 
 (defcustom eshell-hist-ignoredups nil